From 8f5b147a50085f77f65f59e1c9150925f0492dee Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 28 Apr 2005 22:36:45 +0000 Subject: [PATCH] bitkeeper revision 1.1327.1.12 (4271657dvd6v7i5Y8X39HQ9Fu_LjoQ) Fix more cleanup oops --- .rootkeys | 2 +- xen/arch/ia64/patch/linux-2.6.11/hardirq.h | 14 +++++++++ .../ia64/patch/linux-2.6.11/linuxhardirq.h | 29 ------------------- xen/arch/ia64/tools/mkbuildtree | 9 +++--- 4 files changed, 19 insertions(+), 35 deletions(-) create mode 100644 xen/arch/ia64/patch/linux-2.6.11/hardirq.h delete mode 100644 xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h diff --git a/.rootkeys b/.rootkeys index a4177c1adc..09b55726d2 100644 --- a/.rootkeys +++ b/.rootkeys @@ -1084,6 +1084,7 @@ 425ae516maKAsHBJVSzs19cdRgt3Nw xen/arch/ia64/patch/linux-2.6.11/cpumask.h 425ae516cGqvMzGtihTEsQXAXsuOhQ xen/arch/ia64/patch/linux-2.6.11/efi.c 425ae516Y1A4q4_Kfre3qnDj7lbHJg xen/arch/ia64/patch/linux-2.6.11/entry.S +425ae516txAP-owjzpTJ7ThfzWR8nw xen/arch/ia64/patch/linux-2.6.11/hardirq.h 425ae516PDO1ESDHXHVeDNvlqUfmdQ xen/arch/ia64/patch/linux-2.6.11/head.S 425ae516JR7HWvt1zxJ-wLvEWmJGgg xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h 425ae516AHRNmaVuZjJY-9YjmKRDqg xen/arch/ia64/patch/linux-2.6.11/interrupt.h @@ -1092,7 +1093,6 @@ 425ae516qQA5dHuIybqfN3nEzM_Zvg xen/arch/ia64/patch/linux-2.6.11/ivt.S 425ae516atiECmpn_6nZDw4kkmbJ6g xen/arch/ia64/patch/linux-2.6.11/kregs.h 425ae516lwlYwHG1Jv93kC3tfU5caw xen/arch/ia64/patch/linux-2.6.11/lds.S -425ae516txAP-owjzpTJ7ThfzWR8nw xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h 425ae516Je2zI-Iw30_uGhvUYdlCZQ xen/arch/ia64/patch/linux-2.6.11/mca_asm.h 425ae5160-9wHxh0tOnIjavEjt6W0A xen/arch/ia64/patch/linux-2.6.11/minstate.h 425ae516N7SaORdbodDr90tmtCzYXw xen/arch/ia64/patch/linux-2.6.11/mm_contig.c diff --git a/xen/arch/ia64/patch/linux-2.6.11/hardirq.h b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h new file mode 100644 index 0000000000..76b2115d66 --- /dev/null +++ b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h @@ -0,0 +1,14 @@ +--- ../../linux-2.6.11/include/linux/hardirq.h 2005-03-02 00:38:00.000000000 -0700 ++++ include/asm-ia64/linux/hardirq.h 2005-04-28 16:34:39.000000000 -0600 +@@ -60,7 +60,11 @@ + */ + #define in_irq() (hardirq_count()) + #define in_softirq() (softirq_count()) ++#ifndef XEN + #define in_interrupt() (irq_count()) ++#else ++#define in_interrupt() 0 // FIXME LATER ++#endif + + #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL) + # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) diff --git a/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h b/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h deleted file mode 100644 index 7332588e64..0000000000 --- a/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h +++ /dev/null @@ -1,29 +0,0 @@ - hardirq.h | 6 ++++++ - 1 files changed, 6 insertions(+) - -Index: linux-2.6.11-xendiffs/include/linux/hardirq.h -=================================================================== ---- linux-2.6.11-xendiffs.orig/include/linux/hardirq.h 2005-03-02 01:38:00.000000000 -0600 -+++ linux-2.6.11-xendiffs/include/linux/hardirq.h 2005-03-25 08:49:57.301998663 -0600 -@@ -2,7 +2,9 @@ - #define LINUX_HARDIRQ_H - - #include -+#ifndef XEN - #include -+#endif - #include - #include - -@@ -60,7 +62,11 @@ - */ - #define in_irq() (hardirq_count()) - #define in_softirq() (softirq_count()) -+#ifndef XEN - #define in_interrupt() (irq_count()) -+#else -+#define in_interrupt() 0 // FIXME LATER -+#endif - - #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL) - # define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked()) diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree index 6655fe7b06..104d0852fc 100644 --- a/xen/arch/ia64/tools/mkbuildtree +++ b/xen/arch/ia64/tools/mkbuildtree @@ -90,8 +90,7 @@ cp_patch arch/ia64/kernel/ivt.S arch/ia64/ivt.S ivt.S cp_patch arch/ia64/kernel/setup.c arch/ia64/setup.c setup.c cp_patch arch/ia64/kernel/time.c arch/ia64/time.c time.c cp_patch arch/ia64/kernel/unaligned.c arch/ia64/unaligned.c unaligned.c -#cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S -softlink arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S +cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S #cp_patch mm/bootmem.c arch/ia64/mm_bootmem.c mm_bootmem.c #cp_patch mm/page_alloc.c arch/ia64/page_alloc.c page_alloc.c @@ -174,7 +173,8 @@ cp_patch arch/ia64/hp/sim/hpsim_ssc.h include/asm-ia64/hpsim_ssc.h hpsim_ssc.h softlink include/asm-ia64/current.h include/asm-ia64/current.h #cp_patch include/asm-ia64/gcc_intrin.h include/asm-ia64/gcc_intrin.h gcc_intrin.h softlink include/asm-ia64/gcc_intrin.h include/asm-ia64/gcc_intrin.h -cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h +#cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h +softlink include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h #cp_patch include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h hw_irq.h softlink include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h #cp_patch include/asm-ia64/ide.h include/asm-ia64/ide.h ide.h @@ -268,8 +268,7 @@ cp_patch include/linux/cpumask.h include/asm-ia64/linux/cpumask.h cpumask.h softlink include/linux/dma-mapping.h include/asm-ia64/linux/dma-mapping.h #cp_patch include/linux/efi.h include/asm-ia64/linux/efi.h efi.h softlink include/linux/efi.h include/asm-ia64/linux/efi.h -#cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h linuxhardirq.h -softlink include/linux/hardirq.h include/asm-ia64/linux/hardirq.h +cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h hardirq.h #cp_patch include/linux/init_task.h include/asm-ia64/linux/init_task.h init_task.h cp_patch include/linux/interrupt.h include/asm-ia64/linux/interrupt.h interrupt.h #cp_patch include/linux/mmzone.h include/asm-ia64/linux/mmzone.h mmzone.h -- 2.30.2